gtkpopover: Remove GtkPopoverMenu special case
authorCarlos Garnacho <carlosg@gnome.org>
Tue, 13 Oct 2020 12:58:13 +0000 (14:58 +0200)
committerCarlos Garnacho <carlosg@gnome.org>
Tue, 13 Oct 2020 14:55:53 +0000 (16:55 +0200)
Now that there's ::cascade-popdown, we don't need to treat
GtkPopoverMenu especially here.

gtk/gtkpopover.c

index c6fa5851d1d5847815ad68a7143cb86d2e39ee41..bcaf344f4ddaee0f9e0913194f2335bfca6da14b 100644 (file)
@@ -596,19 +596,6 @@ gtk_popover_native_check_resize (GtkNative *native)
     present_popup (popover);
 }
 
-static void
-close_menu (GtkPopover *popover)
-{
-  while (popover)
-    {
-      gtk_popover_popdown (popover);
-      if (GTK_IS_POPOVER_MENU (popover))
-        popover = (GtkPopover *)gtk_popover_menu_get_parent_menu (GTK_POPOVER_MENU (popover));
-      else
-        popover = NULL;
-    }
-}
-
 static gboolean
 gtk_popover_has_mnemonic_modifier_pressed (GtkPopover *popover)
 {
@@ -720,7 +707,7 @@ gtk_popover_key_pressed (GtkWidget       *widget,
 
   if (keyval == GDK_KEY_Escape)
     {
-      close_menu (popover);
+      gtk_popover_popdown (popover);
       return TRUE;
     }